From: kfraser@localhost.localdomain <kfraser@localhost.localdomain>
Date: Tue, 11 Sep 2007 12:40:44 +0000 (+0100)
Subject: Add 'type vnc' to vfb device sexpr for HVM guest
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14979
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=4a6a1afb1cd360b0b1c482d86aa25fd284e22b28;p=xen.git

Add 'type vnc' to vfb device sexpr for HVM guest

This patch adds 'type vnc' to vfb device sexpr for HVM guests.  PV
guests already contain this entry in sexpr, e.g.

    (device
        (vfb
            (vncunused 1)
            ...
           (type vnc)
            ...
        )
    )

Some tools, such as libvirt, look for device/vfb/type in sexpr before
publishing VNC port.  More importantly, this patch provides
consistency in vfb device sexpr between HVM and PV guests.

Signed-off-by: Jim Fehlig <jfehlig@novell.com>
---

diff --git a/tools/python/xen/xend/XendConfig.py b/tools/python/xen/xend/XendConfig.py
index 6db58f52d9..7ec493a059 100644
--- a/tools/python/xen/xend/XendConfig.py
+++ b/tools/python/xen/xend/XendConfig.py
@@ -752,6 +752,7 @@ class XendConfig(dict):
 
             if not has_rfb:
                 dev_config = ['vfb']
+                dev_config.append(['type', 'vnc'])
                 # copy VNC related params from platform config to vfb dev conf
                 for key in ['vncpasswd', 'vncunused', 'vncdisplay',
                             'vnclisten']: